(command-line): [windows-nt]: Check for existence of

.emacs file so as to notice .emacs.el or .emacs.elc and use them
in preference to _emacs.

diff --git a/lisp/startup.el b/lisp/startup.el
index ccdc8804bd4f756b5d39a02653cde2fc13664ac5..33e267ffe9f7d013f479f162e55e3d0c39aa2b1d 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -689,7 +689,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
                           ((eq system-type 'ms-dos)
                            (concat "~" init-file-user "/_emacs"))
                           ((eq system-type 'windows-nt)
-                           (if (file-exists-p "~/.emacs") 
+                           (if (directory-files "~" nil "^\.emacs\\(\.elc?\\)?$")
                                "~/.emacs"
                              "~/_emacs"))
                           ((eq system-type 'vax-vms)